renamed refactor, removed old js