Remove unused vars
Avoid typedef redefinition