Cleanup after remove of Firefly dependency

The following files do not appear to be used anymore. This could be cleaned up.