Removing environment specific code