[wrt] Clean up for wrt common suite