Ed cleaning up some parts.