basic manifest cleanup
more cleanups