Removes an unused class.
Removes two long deprecated views that just muddy the waters.