b137d740

By: Greg Pfeil <greg@technomadic.org>

Remove remaining Garnix bits

These were causing warnings and blocking merges downstream, so clean it up.