Cleanup after remove of Firefly dependency