Forgotten files
Removed odd ugly unused fake function call
Some duplicated structures