Removed some redundant stuff.