Remove account fields and add project fields