Removed unnecessary interfaces