fix dependencies, clean up demos