partial lint fixes, removed unused imports