Remove unnecessary