Final simplification of Caps Support