Remove creepy and unused extensibility. Don't use optional injection only for tests.