Remove combined interface and split implementations. Signed-off-by: Derek McGowan <derek@mcgstyle.net>