Build cleanups. Removed targets for old "shib target" code.