RF: Clean up imports in management command