Merged initial set of changes related to removing deprecated code and few imp...