Remove unused requires, fix table key name escapes

Signed-off-by: Ben Agricola <bagricola@squiz.co.uk>