Removed custom add/remove functions from env