Removed dependency injection references (covered in part7)