Mark deliverable code for baselines. Remove dead commented-out code.