remove clearance overides, update commenting name method