refs #276 - Cleanup obsolete code