[D#480] cleanup and language calls