Manifest cleanup, ordered somewhat more intuitive