Removes affiliate user functionality
Fixed merge conflict