Clean up waiting guy