Plugin cleanup
Plugin cleanup and Unite settings