removed useless listener
removed useless listener
finished TODO