[NUCCORE-1118] Clean up and refactor
addClass/addClasses/removeAllClasses