Move GA to partial, replace hardcoding w/ vars

Supports #201
Clean out mistakenly added layout backup files