Get rid of unnecessary interface