Removing clutter.
Removing remaining clutter.