Remove stuff that should not have been imported, fix up ops/* stuff that
doesn't relate to update