Clean up base.js
Clean up models