More cleanup
Don't depend on fenix-legacy-tools