cleaned up bogus logic