clean up and move around sources