Moar initial manifest cleanup