:lipstick: remove dead code and comments