Removed all references to modal