Incomplete zones, plus refactoring and delinting