Removed all comments and obsolete code regarding dependency injection
Use interface instead of real class