StaticSpaceExpression cleanup