Remove unnecessary classes

Closes atom/atom#4528