Wheel cleanup

fix for #951