cleaned up finishing handshake steps
Merge branch 'pipeline_refactoring' of https://github.com/nskinkel/oppy into pipeline_refactoring