fixed cleaning and removed unneeded plugin require