cleanup and added plugins