Update and cleanup manifest