Removed unnessecary waits