removed debug code and comments