Removing dead code, adding better orphan support

Orphan gamedata should be easier to deal with now