Mo' language cleanup