Swap out stuff that seems to do nothing