Clean up of some debug code not needed anymore