removing more clutter