Cleanup and removed some debug output