WL-3119 Tidy up removal of user directory service