Removed check for older format