Remove unnecessary overhead