Revert "Goblin Algorithm Changes"

This reverts commit 164b60a88742681b03ccb629a464134582e17ffa.
Accidentally bork NN

hopefully this should fix