Column enforce
Clean up of plugins not used