Remove dependencies
Fix issue with saving / updating users