More cleanup. compiles, but not tested on HW