Removed some supefluous calls