Removes hardcoded references to User