removed users refactor