Removed and renamed some JS