Remove trait from UserFactory for 5.3 compatibility