Clean up unused helper functinos