Fix bug - remove redundand piece of code