Addressed KHuey's feedback

- static Enabled()
- remove observer removing from destructor