Dev cleanup

Merged Onkar Sutar requested to merge DevCleanup into DevBranch