Removed pipeline and just kept helpers