Removed useless typedef
Removed useless forward declaration