Removed Timer from several classes.