remove a couple of lingering AFP_