Revert "More functions"

This reverts commit 083eda9934bbf14868b0ed39650d343c5b9f0943.