remove function
Merge branch 's1-2.4.x' of https://github.com/s1-platform/s1 into s1-2.4.x