Remove/comment out unused code