Users can now be set active/inactive + cleanup