Gotten rid of redundant interfaces