Remove rest of functionality out of helper