Fix memory leak
Cleanup includes