Finally removed the Bean Visitor