Cleanup debug statements