Comments and commented out code cleanup