APD-625: removed not required code