modify files and mark unused code
Merge remote-tracking branch 'origin/Development' into Development