Removing dep on env