TROIA-237 more verbose logging no shutdown and more cleaning