Cleanup old includes that are no longer needed