removed useless lines of code