Word model clean up