Remove unnecessary magic