Lots of cleanup after a mock run through