Fixed last commit, and removed a bunch of needless stuff.