linting, remove some dead code