Reducing forward declarations
Removing unnecesary forward declaration