users are not deleted anymore, only made inactive
merge with master