Cleanup, one true JS file