Entry sentence cleanups