I was right
Removing useless stuff

Change-Id: If6538b9a86bc308e6ba89bd5ea2b85b9c61bfbda