removed unnecessary param ignore_ms
removed obsolete code