Remove unused class.
Start fleshing out interfaces.