remove TODOs
use context instead of describe where appropriate