#12 : Cleaning some unuseful code