lint fixes, remove unused variables