Removed button waits