cleaning up ward code