[ ENGINE-682 ] CR : Removed mockup