Remove support for old format