Removed debug code, comment changes