Removing some unnecessary artifacts