Feature/remove unsed user validation