Remove unnecessary clutter