Cleanup after csm 4.2.3 downgrade