various cleanup for unused files and the addition of tokeninfo for sample parity