removed some shib