I think these interfaces aren't used anymore, and can be removed. Let's check this out.