Removed mock temporarily used

Change-Id: I25e98d4934396129b8aaa7c66c66c3bfb897ecb2