Use from context for GA inputs.
Remove commented code.