+ cleanup headless.
+ This will enable to less issues with dependency with project, and headless service in release mode