Cleaning : removed unused code