dependency injection method detection is no disableble
More fixing and cleanup