namespace reserved word cleanup