Remove old comments and debug info