removing dependency on Former, gradually