Yet more cleanup