Remove more clutter