Remove fields dependency