Removed code didn't align with engine requirement