removed useless comments & methods