+1 to this cleanup.