Clean up plugin loading and removed comment