Removing unnecessary waits