Removed unneeded modifiers