(Android) Input driver - cleanup pt. 1