eliminated base from many places