Fix removing multiple quadlets with same name