Taking out weird logic