still cleaning things up