Cleanup unused imports

Change-Id: Idbbba34ace16774d6f4d81f10ec8ddff618428d7