remove context-based fitting; will be handled externally