some cleanup - still 1 Unfreed K - #187