cleanup for issue#6