World: Remove some hardcoding