remove unnecessary classes and just instantiate with desired constructor