Merged User and Person; deleted the latter