removed unneeded manualTimer