Improved Updater code

Basically I removed a lot of nonsense.