Refactored the ClearService code
Add enable menu option