Clean up. Deprecated flows/models etc removed.