forgot to remove references to clock