Merge pull request #147 from opennetworkinglab/devl/cleanup_script

Cleanup script