cleanup and fix GA