Removed some unnecessarities.