Feature/ocr cleanup