Some cleanup in GA part. Almost functional now.