User Repo Tweaks

Removed two unused use statements and changed `and` to `&&` to make sure we are definitely getting the desired behaviour.