Deactivated failing cleanup method. (commit: 980e7603b64465fb8ed6848f438c007b38b34239)
Fixed an issue with deactivation on shutdown. (commit: 1faae7cba3d62959b5aebece7f0c3d9529ce9922)