BUG: Need to make sure information keys are around when this factory cleans up. Also cleaned up the code.