fix lisa
more cleanup