Revert "New user function"

This reverts commit 819aa4530b3993354623745592cbcbf76b22f2a7.