Remove wait variable