Remove the delay bug, due to a sleep(60) that was left behind...
Some code clean up