Engine

Hint removal minor updates