Cleanup templates. Fix GA