Cleaning up includes