Reduce reflection warnings and clean up

Change-Id: I7a1d5c0bfa67a433124410de1486fb87a363043e