Removed fields to moved to other configuration files