Remove old clock class