Removed and merged unecessary files, removed old JS