Cleaning of older code. Got rid of the performances testing code as well. The code should now be ready to be integrated