Cleaning up debugging statements