old classes was removed, closed #4, closed #5