Remove unnecessary interfaces