Start cleaning up bit by bit