Revert "some functions"

This reverts commit bf1d6ec9eff530812efcdeedd86a064d96c4f1c1.