Clean up the traits
Clean up the providers
Minor update to the nova utility