#727 Clean up some update features, makes it easier later on