Remove cruft
Update word list