Tidy up HeadlessView