Some code -cleaning- unused things deleted