Partially removed dependency on the Spring for wiring services