Cleanup after Fusselwurms review