Removed obsolete fields for now. Compatibility can be achieved by other means.