merging retire fence and other cleanup