Renamed functions and remove not used one