Removed some older files, ensured js file is only parsed when necessary