Dropping the users ref and adding database arg in more places.