More tweaks. Remove mayor.js