Minor clean-up after merge from AV
Minor clean-up after merge from AV

cpadavis/SpaceWarps,drphilmarshall/SpaceWarps,cpadavis/SpaceWarps,drphilmarshall/SpaceWarps,cpadavis/SpaceWarps,cpadavis/SpaceWarps,drphilmarshall/SpaceWarps,drphilmarshall/SpaceWarps