Removed warnings from logic