[FINALIZED] Integrated system update and clean-up

[Granite]

Here is an improved version.