More cleanup. Some testing