Clean-up and Steg add