Also removed some dead code from sources. Change-Id: I570eda45285771068711ef90d22550632411e98f Story: #2002048 Task: #26208