Remove obsolete code; refactor for reduced coupling (Ca, Ce)