Getting rid of the is_active flag ref #112