clean up includes and demo