removed println debugging and cleaned up the fixes for 3733