Clean up JS files
Merge branch 'cleanUp' into develop