Removing environment dependency