and remove the old class