Fix headless build, add comment, cleanup