quadmap cleanup again