remove debugging statements
Small tweaks for upcoming refactor