Cleaned up config/model namespace.g