Remove annotations from the API, closes #29