remove need to use custom plugin