Remove 'default-platform-properties'  and reduce scope
12 files changed