merge to remove unused js