Removed old code from GA