hammerhead: cleanup

Change-Id: Ia2faa42c87bf6f1421bf23ab24e6d717e39627e6