more clearing out legacy