code review: remove unused code