Clean'er'code

As mentioned before, took stuff out. It hurt even more.