Rollback some debug code and add some comment