Remove and clarify fields