Refactored Remove interface IToggleable #96