Remove Environment dependency on Variable class