remove support for OR and XML, change output format