Stripping it down for modularity