Cleanup starting to take shape