[Core] - Removed useless code