Remove dependency on keywords plugin