Moved to less trait heavy pipeline
broke up pipeline
cleanup