[Did] some cleanup.