remove logic to gem