Dev helios cleanups and dummy code

Backporting from release-254.