Cleaning up caveman debugging calls