First pass to cleanup admin.js