clean up and update manifest