Remove check for no-longer-used env var
Move a declaration closer to its use