Remove and comment-out unused code