Backed out Shib stuff, quick check/cleanup.