remove un-needed code, clean up base.js