Cleanup of section 2