Removed debug code
Removed obsolete comments