[world gen] lots of little fixes and changes to remove unneeded declarations and code