Fix gps and other cleanup

Change-Id: Ib866b6df3c4f7ff8e5f2f7c8f1d455dfe6de2378