I have pushed first round of clean up, will keep this issue open for now as d...