Removed some stupid logic