removed useless namings