remove obsolete imports

Change-Id: Ic01f8154882266c8aa2ebd0d51cefc947bb5c6d0