Remove q dependency
Lint files