refs #38 -- cleanup