Remove unnecessary waits and increase sleep times