Make core reuse pipe
Fixed a small conditional statement.
And removed an unused method.
Merged master into wip/use-settings
Merge branch 'wip/use-settings'