remove/add some debugging messages