Restructuring and cleanup.