Updates to remove susy 1.x dependency