Manifest clean up and adding in endeavoru