removed references to timer.*