Removed some debugging prints and test code