Remove waterstreet-isms