Clean up linting errors
Remove old code blocks