Crop and cleanup

Signed-off-by: Thejasvi Bhat <thejasvi@smashed.in>