remove obsolete imports, remove old code stuff

Change-Id: I3d9d68c1736fd5c3a0e675b555d0b7743f3e5232
Merge "remove obsolete imports, remove old code stuff"