change plugin, cleanup stuff