Trying to get rid of the clutter.