Cleanup from mary review