Added my own util plugin + cleaning.