some further cleanup