Remove an unused class, along with some whitespace