deleted more stuff from main.js

deleted more stuff from main.js
Merge branch 'John'