Revert "[Core] Some clutter removed"

This reverts commit 1f96d87f9ffbbfab15abf5bce30b31707015929d.