General simplification

Reducing the shared footprint