Remove commented out code?