Clean up Cap configs a bit