Remove complicated update logic

There really was no reason to have this logic, and it caused some display bugs
when things weren't updated correctly. Additionally, update the gui thread test
code at the bottom of the file.