Remove comment-ed out code