[REF] remove commented code
[ADD] More ignores