Keyword parsing cleanup
Remove unused variables