remove function calls
tweaks to create-user and remove function calls