First step in cleaning up fields