Removed some debugging/old code