Remove unused imports from Lib

Change-Id: Ia2ae11c8e1fb6e47a1b5b1a3d30c6cb6fe339392