Moving things in place, cleanup