Remove commented out code