Cleaned up Spring registration - moved to AutowireCandidateResolver