Remove unnecessary (for now) classes, add nippy