BUG-868: remove unused things

Change-Id: Ia90c279cb4f0871e4dccc4facf2dd739ab83d573
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-868: remove unused things"