add comments
remove unused dependency and methods