Fix bug in last commit / KinkRemover
Performance improvements for KinkRemover