remove unused code
code-style, comments