remove unused code
merge files so that there are only 2 JS files