Added self-host & cleanup