Remove rampart dependency