Clean up non-spring injection setup