Removing rampart dependency for the framework