Cleanup / readability and commented out not (yet) used plugins