More cleaning up for switch to prop