comments fixes + unused code removal