Removed unnecessary waiting steps
Removed some more waiting steps