Move inspection entirely out of core