Moving unnecessary functions from utils in respective plugins