Remove debug comments and printing