Continued cleanup
Major code cleanups and removal of unused scripts
Final cleanup before job application