Update stuff, yet again.
Remove more stuff!