Removed reduntant code.