Cleanup
 Cleanup and update plugin loader