cleanup debug prints and comments