@RaymondLim 
This was existing code that I just moved so Glenn suggested that we remove it but there needs to be some testing around this and you are the best one to do this. Can you make this happen in another branch since this one has been merged?