Remove unused and commented out code