clean up for new organisation