Cleanup
Add code for INEX 2007
Rapport