enabled unused code again to make user removal work