removed obsolete injection (make it more simple)