Cleanup of dwb