Remove unnecessary conversion
Add setup