BLK: Clean up

Change-Id: I0bbe49686140415604df12ecabaa26760729ab55