remove dead code
add missing include