Lang cleanup