Remove cruft, comment better.