EAGLESIX-3157: Pipeline: sync w/ original code, misc comments and styling, rm unused