Removed some bad logic