More cleanup, still bOrken