Fix disparity between minified and un-minified JS. Also remove an unneeded function.