ref #4160 - add the possibility to delete a users subscription
general - cleanup some class files