updates to remove variables