removed comments and commented out code