Removed possible conflicts with other plugins