More thorough removal of hammerstuff