Remove unused code, add comment