Removed good-eggs specific logic