remove unused stuff on headless branch