rename and remove not used methods