more cleanup for pre-2.0