remove a bit more wharfie