cleaned up unused namespaces in models