More cleanup again, can still reproduce