g-a-s cleanups