Removing old debug code + comments.