Remove code tagged as "can be removed after Icehouse"

Change-Id: Ib78f3d55c9dcd46e0dfc3343c32e077cf530b5f7
Merge "Remove code tagged as "can be removed after Icehouse""