removed more now-unused classes

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>