remove commented-out code; refine access controls