Whoosh cleanup 2