Remove metadata token TODOs
Additional error handling. Add nice message when type can't be root imported