[RFCT] Even more clean up