some more cleaning
remove some notes and put in the pull request