Cleaned up some clutter.