Removed some redundant code.