Kick and plugin.yml cleanup