Removed pointless interfaces