Previous fix code cleanup

Fixes #4295

Todo: investigate sub-areas not inheriting var/fire