proper cleanup on deactivation - close #2