3.6.1.3 and cleanup.