Yet more cleaning up