Merge pull request #758 from ebering/banished-cleanup