Removing some unnecessaries