Ship and RandomEvent cleaned up