Whoosh cleanup 3