Hammerhead cleanup