remove unused variable
add missing include
remove superflous include