remove namespace and closure