ref #12 cleanup