deprecation
external system - fixed problems
removed deprecated code usage