Moved cleaners to the individual plugin classes