More Cleanup although now 2/3 status tests are failing