MP1-4578 : Removal of non-necessary code