Fix up assumptions and remove suburban transform