First take on pipeline fix
Cleanup