Fix include of settings
Fix settings import (remove it). Lint cleanup