Remove unused/commented out code