base

Fix warnings

* wrong package vs. file path (this was an error in eclipse)
* unused imports
* unused variables (at least for now)

Change-Id: Ic316e7e8586f75df5a048e98a21a65abf777deda