Removed reduentant code.