Remove some unnecessary complication.