Removed some duplicate code that I foolishly just added in the last checkin