more structure crafting cleanup