Removed further redundant code.