Removes some commented out code and some debug messages leftlovers from my previous commit.