Agreed, and as such a cleanup is outside the scope of this PR, this should be merged (provided the reload and odd ActiveTab switching works)