Revert "Revert "CET Cleanup 5/23""

This reverts commit f7e99a5a319b38af533709d007fe482ac4016733.
Revert "Revert "Syncing""

This reverts commit 83aa5e68b2decd74da1da7a33f873f9eeeff9195.
Revert "Revert "Commit once again""

This reverts commit 3d1c2e4b58665eff9a817e7c23368f6fe5065982.
11