Refactor: removed unused code