Merge "Remove commented cruft, TODOs, and dead code."