More cleanup few more questions added