cleanup for 2.3 launch