Cleaning everything

Change-Id: Ibcee924f3fa36b4cf83702c7d363da692923cfd6
Signed-off-by: NiharKhetan <nihar.khetan@gmail.com>