cleanup
May05 fix