remove unused and commented out code