Removed a couple of redundant classes. Too complex models to be
built-in.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>