More resource clean up from switch to custom user model