Cleanups / remove debug statements