some cleanup
bug !!