Removed unused imports.

Change-Id: Id5b67124ffe2d5686b0fd69a829a71e8005fa066
Added diamond generic where possible.

Change-Id: Ie39b735172ac055ea09b5ad7cd58ddb1d3ec4dc8