Lint: Removed unused code