removed MLS specific code