Remove references to scope