Removed keyword table (will add it to a separate pull request)