Removed files we don't need for Dev1.2.4

[Branch: dev1.2]
Merge incomming changes.