Revert "Added wait.for"

I realise now that it isn't as grand as I thought. All gone!