logic complete, cleaning up ...