Cleaned up some TODOs on plugin descriptor