Cleanup previous merge - refs #403