Remove code moved to shib-common