Removing some unnecessary leftovers.