Add GA and do some clean