dunno why this was never reported as bug, but I fixed that one
removing unneeded comments; moving cleanup of missing AFC comment before the cleanup!