Minor refactoring, cleanup on disable