Fix typo and remove unneeded class

Since my previous commit made the message unclosable, I removed an
unneeded class and fixed a typo.