final cleanup on capright
Merge branch 'capright' into testing