Cleanup from unit testing of user and app mainatenance