cleanups

Change-Id: Ia649e85bf4a4967e98115a48184be07eb460524c
bump versioncode

Change-Id: I65064a3512f89e09b7d4244d35940f8a1cccf61e