option remove image field
apply lint refactorings across scenarios