Removed useless stuff.
Merge branch 'hotfix/Remove_useless_and_harmfull_stuff'