Cleanup of code.  Assets are currently not compiling though because of JS?