Restructure for cleanup.