(refactor) Remove unused code and comments