BUG-865: removed unused code.

Removed unused imports, replaced deprecated code.

Change-Id: Iec9c79dd2592133eb953367f23f38c3626531745
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Merge "BUG-865: removed unused code."