initial cleanup
provisional API experiment