Strip down and upgrade