fixed linter and removed unused code