Cleanup in the code

Hello,

This pull request falls in a "cosmetic" change but it removes extra headers and functions from the code to have cleaner files since some of them are a bit messy. :smiley: 

@vmg : I would love to be sure that these snippets are really useless. The tests are passing on my machine though. Let me know if we should not remove some of them. Thank you!

Have a nice day.