Cleanup and rearrangement of objects