Cleaned from not cmdmanager code
Cleaned from not cmdmanager component