Remove deprecated code in internal packages. Change-Id: I65ec74b3a046f8c23f0aacf056024d0fb5bcbe9d Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>