Removed unecessary loop