Remove some complexity