Revert "Gideon branch"

Reverts GSamuel/Wakkerdam#2