Removed some duplicate stuff.