Removed some unnecessary forward declarations