Remove lang cleanup and fix dir