refactor
comments, rm unused entry