Remove a bit of random hardcoding...