Remove unused imports

Change-Id: Ia003d5603382947d3bb845ba5a6d0c9c9fe4b433
Minor code issues

Change-Id: If86f234175c57f8c003851e464cc170b4ccbd3bf
Reduce complexity

Change-Id: Iba4e9f8f545b50dcb641b4e2038d48a3269fef6c
Add method visibility

Change-Id: I7395bc92d1c42e720b42ba65e962e49b13a057f1
Remove silly parameter

Change-Id: I946c4f7ae568a3afa914963da58ca5fba7cfe39a
Add method visibility

Change-Id: I68a2abad8a11b1612aa5a6564d71c1b6dbaf85de