Removed some debugging and some other stuff