Remove the remaining use of the lang facade