name space cleaup