Remove extra condition variable