GA and some other cleanups