Remove APVShot and APVShotFinder classes