Fixed redundant stuff.