Some cleaning minor improvements - deleted some unnecessary informations