Consolidate / cleanup obsolete code.