Removed some deprecated functions/code [tracker #1700]