cleanup for regex fix