remove no longer needed code
cleanup debug printouts