Remove KSP (#823)