added user and device cleanup methods