Reverted timeout process
Comment out unused functions