Fix comments + remove unused code.