Made changes related to remove functionality.