Set up account delete serverside
fix merge conflicts