Removed unused methods.
Fleshed out new multi-type classes.