Cleanup for the new structure.