More patchwork clean up

Undo some more patch buffoonery, remove chemistry_loaded sentinal on
clean.