Merge Shubham-cleanup to master