cleaning out old unused stuff (see #29)