User deletion

merge leftovers?