Remove dependency on $timer since it's no longer used