Removed debug code
Cleanup