Cleaning the Repo for my convinience

Change-Id: I4dd340fea5a66068c913b2e5e7aa4bb846c8e823