code cleanup-- removed commented debug stmts