Revert "Core Common"

This reverts commit fe533af3fc87bb114daadb8089208cc9282dbbae.