Removing code commented out
Cleaning up civs.model.society