Removing things that wheren't supposed to be there
Refactoring some treasure types and generators