Capella cleanup

Capella cleanup