Only using Tree when neccessary
Using callbacks when we delete a user from a course.  Also removed some comments.
Setup to use the new behavior: Users.UserGroupable
conflicts resolved