Clean up check plugins more