unused code
minor fixes