manifest support and clean up