Change syntax of DEFINE-FOP, and remove from target image.