Fix memory leak
Clean up includes