further cleanup work