hammerhead: cleanup

Change-Id: Iaab032e7870fc1b5042ea78d952e8c74929b3c20