Get rid of complexity we don't need