remove unnecessary code
scan tab fixes
scan tabs - another fixes
Merge pull request #1085 from andrzej-jankowski/cleaning

[Core] Cleaning