Remove surplus commented out code