Some more lang cleanup