demo: cleaned up unused