#22 Further serious cleanup