Cleanup check primary support

See commit shortlog