Removed unused code
Work on rapport