CAD template cleanups