Remove minor unnecessary cruft