Eliminated spurious self's in User model