removed active/inactive mess