Code refactor: removed unnecessary code.