Remove unnecessary modifiers