[Core] Cleanup to previous commit