Clean up of old density engine