A few fixes following previous commit, including removing old Update code that should've been removed in the previous change.