cleaning up
merged
remove duplicate user