remove more hardcoded demo code