Removed Multitenacy stuff