Revert "Headless Client Integration"

This reverts commit d7b40263cc9f0a0b1c3d602eb45ddaa8840757da.