Removed redundant code that was left out