Removing useless files
Changed location type to name conversion method