Update: clean-up