Clean up

Change-Id: Icf4546dea96a3acf4dd9dc878d9ec3a7ca2842bf
Signed-off-by: iceandfire <arhamjamal@gmail.com>