Remove old classes before adding new ones. Updates #38