further cleanup for org version