Remove extraneous logs and commented-out logs