Clean up models. Added active/inactive scopes to select models