remove logic for now