More user fields added, more cleaning