+ added remove/deactivate/activate functions