clean up for new update