Add gps optimizer
Remove inused code