Remove debug comments and test() function