remove debug code and comments