Refs #74: cleanup out-dated code