Comment unused code main, refactoring, list TODO, clear header functions